tests: Stop using the delete-event signal

We can use ::destroy in most cases.

diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c
index c8e57769ae4ff9f7b6b657b1e6688d0731ffdfdb..92db4c4d788a32083b639ca8272a7b060e95467a 100644 (file)
--- a/tests/overlayscroll.c
+++ b/tests/overlayscroll.c
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
-  g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20);
   gtk_container_add (GTK_CONTAINER (window), box);

diff --git a/tests/showrendernode.c b/tests/showrendernode.c
index d1ab64eab7310cc807d11263bff5f33613c21380..298e0ec866e8e65efce18f5094b1127cad9bf70d 100644 (file)
--- a/tests/showrendernode.c
+++ b/tests/showrendernode.c
@@ -218,7 +218,7 @@ main (int argc, char **argv)
                      MAX (600, node_bounds.size.width),
                      MAX (500, node_bounds.size.height));
 
-  g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   gtk_widget_show (window);
   gtk_main ();
 

diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index b97b35c47455f000cf8315d9190486229c53dac4..76abf27219d17a2f18c220d8f2d178f1346d5233 100644 (file)
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -66,8 +66,7 @@ open_test_window (void)
   test_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (test_window), "Tests");
 
-  g_signal_connect (test_window, "delete-event",
-                    G_CALLBACK (gtk_main_quit), test_window);
+  g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), test_window);
 
   gtk_window_set_resizable (GTK_WINDOW (test_window), FALSE);
 
@@ -132,8 +131,7 @@ open_control_window (void)
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Controls");
 
-  g_signal_connect (window, "delete-event",
-                    G_CALLBACK (gtk_main_quit), window);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (window), box);
@@ -232,8 +230,7 @@ open_alignment_window (void)
   test_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (test_window), "Alignment");
 
-  g_signal_connect (test_window, "delete-event",
-                    G_CALLBACK (gtk_main_quit), test_window);
+  g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_window_set_resizable (GTK_WINDOW (test_window), TRUE);
   gtk_window_set_default_size (GTK_WINDOW (test_window), 500, 500);
@@ -294,8 +291,7 @@ open_margin_window (void)
   test_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (test_window), "Margin");
 
-  g_signal_connect (test_window, "delete-event",
-                    G_CALLBACK (gtk_main_quit), test_window);
+  g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_window_set_resizable (GTK_WINDOW (test_window), TRUE);
 
@@ -321,8 +317,7 @@ open_valigned_label_window (void)
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-  g_signal_connect (test_window, "delete-event",
-                    G_CALLBACK (gtk_main_quit), test_window);
+  g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_widget_show (box);

diff --git a/tests/testappchooser.c b/tests/testappchooser.c
index 1030f924821f93d99517f096bd7cc933544ad1b3..baf9adcad2a31951a0d13515b2f77313d1069cfd 100644 (file)
--- a/tests/testappchooser.c
+++ b/tests/testappchooser.c
@@ -221,8 +221,7 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (toplevel), grid);
 
   gtk_widget_show (toplevel);
-  g_signal_connect (toplevel, "delete-event",
-                    G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (toplevel, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_main ();
 

diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c
index 45be8a72aada96d0249368353d8b1e973e1bef73..44476f5a7dba49b2c14f543ae462251373e7fff2 100644 (file)
--- a/tests/testappchooserbutton.c
+++ b/tests/testappchooserbutton.c
@@ -126,8 +126,7 @@ main (int argc,
 #endif
   gtk_widget_show (toplevel);
 
-  g_signal_connect (toplevel, "delete-event",
-                    G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (toplevel, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_main ();
 

diff --git a/tests/testassistant.c b/tests/testassistant.c
index 9d87879f77a774c7048789076630cacb13f28fb3..d0331071c585d20a9e071ce9d3b20c915e626424 100644 (file)
--- a/tests/testassistant.c
+++ b/tests/testassistant.c
@@ -703,11 +703,9 @@ main (int argc, gchar *argv[])
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_hide_on_close (GTK_WINDOW (window), TRUE);
 
-  g_signal_connect (G_OBJECT (window), "destroy",
-                   G_CALLBACK (gtk_main_quit), NULL);
-  g_signal_connect (G_OBJECT (window), "delete-event",
-                   G_CALLBACK (gtk_false), NULL);
+  g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (window), box);

diff --git a/tests/testbaseline.c b/tests/testbaseline.c
index cd7cdad122e3fe315b0525c338b268a63ddaab70..9554b8a8a0269dade8883b56478ec0cf60bedaac 100644 (file)
--- a/tests/testbaseline.c
+++ b/tests/testbaseline.c
@@ -88,7 +88,7 @@ main (int    argc,
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
   g_object_unref (provider);
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   notebook = gtk_notebook_new ();
   gtk_container_add (GTK_CONTAINER (window), notebook);

diff --git a/tests/testbbox.c b/tests/testbbox.c
index ab3a6fbab24dbc15d49957d271b0af125f560810..892691301dbc428bccd548264deb4b16e5f18064 100644 (file)
--- a/tests/testbbox.c
+++ b/tests/testbbox.c
@@ -121,7 +121,7 @@ main (int    argc,
   gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
   gtk_container_add (GTK_CONTAINER (window), vbox);

diff --git a/tests/testborderdrawing.c b/tests/testborderdrawing.c
index cb6d8605ed55bbd5dd9ecf8df4a9ebfe7749c60d..80d5b81a969f73eccac054b064c6f5798a46b653 100644 (file)
--- a/tests/testborderdrawing.c
+++ b/tests/testborderdrawing.c
@@ -151,7 +151,7 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (box), top);
   gtk_container_add (GTK_CONTAINER (box), bottom);
   gtk_container_add (GTK_CONTAINER (window), box);
-  g_signal_connect (window, "delete-event", gtk_main_quit, NULL);
+  g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   gtk_widget_show (window);
 
   gtk_main ();

diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index e8c298324864e0f612340eb1bfc2e9fc320b410a..f93bb56f7f6ed725b4c9729d7567facb9be6ebd3 100644 (file)
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -445,13 +445,9 @@ create_calendar(void)
     calendar_data.settings[i] = 0;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_hide_on_close (GTK_WINDOW (window), TRUE);
   gtk_window_set_title (GTK_WINDOW (window), "GtkCalendar Example");
-  g_signal_connect (window, "destroy",
-                   G_CALLBACK (gtk_main_quit),
-                   NULL);
-  g_signal_connect (window, "delete-event",
-                   G_CALLBACK (gtk_false),
-                   NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 

diff --git a/tests/testcenterbox.c b/tests/testcenterbox.c
index 9d05d187628c44c0686f50f0e5ba9bf4052a7212..326a728bfb10c63d666da1c73a0f25bbc56b489e 100644 (file)
--- a/tests/testcenterbox.c
+++ b/tests/testcenterbox.c
@@ -28,7 +28,7 @@ main (int argc, char *argv[])
   gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END);
   gtk_center_box_set_end_widget (GTK_CENTER_BOX (box), child);
 
-  g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_widget_show (window);
 

diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index f11269d9d931900377709d8b85b804874eafd9e6..878a8e6c6ee2bc80171f69976cc5c43479f025b7 100644 (file)
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -41,17 +41,6 @@ static GOptionEntry entries[] = {
 
 static gchar *gtk_src_dir = NULL;
 
-static gboolean
-delete_event_cb (GtkWidget *editor,
-                gint       response,
-                gpointer   user_data)
-{
-  gtk_widget_hide (editor);
-
-  return TRUE;
-}
-
-
 static void
 print_selected_path_clicked_cb (GtkWidget *button,
                                gpointer   user_data)
@@ -122,6 +111,7 @@ tests_button_clicked_cb (GtkButton *real_button,
       GtkWidget *box, *button;
 
       tests = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_hide_on_close (GTK_WINDOW (tests), TRUE);
       gtk_window_set_title (GTK_WINDOW (tests),
                            "Tests - TestFileChooserButton");
       gtk_window_set_transient_for (GTK_WINDOW (tests),
@@ -155,7 +145,6 @@ tests_button_clicked_cb (GtkButton *real_button,
       gtk_box_pack_start (GTK_BOX (box), button);
       gtk_widget_show (button);
 
-      g_signal_connect (tests, "delete-event", G_CALLBACK (delete_event_cb), NULL);
       g_object_set_data (user_data, "tests-dialog", tests);
     }
 

diff --git a/tests/testflowbox.c b/tests/testflowbox.c
index 22092785ca76f6773695c653f2aea5fd7c4f08f1..5a94ab6fcda98858d05db1354ac95bb2fe3eb31f 100644 (file)
--- a/tests/testflowbox.c
+++ b/tests/testflowbox.c
@@ -635,8 +635,7 @@ main (int argc, char *argv[])
 
   window = create_window ();
 
-  g_signal_connect (window, "delete-event",
-                    G_CALLBACK (gtk_main_quit), window);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_widget_show (window);
 

diff --git a/tests/testfontchooser.c b/tests/testfontchooser.c
index d89d1544d18e910eac530d7c8130fc0604b1e632..e7c349ce37e43631dd1b1fcb9a50f282900301ab 100644 (file)
--- a/tests/testfontchooser.c
+++ b/tests/testfontchooser.c
@@ -73,8 +73,7 @@ main (int argc, char *argv[])
 
   gtk_widget_show (window);
 
-  g_signal_connect (window, "delete-event",
-                    G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   g_signal_connect (fontchooser, "notify::font",
                     G_CALLBACK (notify_font_cb), NULL);
   g_signal_connect (fontchooser, "notify::preview-text",

diff --git a/tests/testfontchooserdialog.c b/tests/testfontchooserdialog.c
index 4c31e29a5885a1f3533687289248d1bf03798c82..e85c6dc773fcbb8e9931ecb0f2528ad089fc121a 100644 (file)
--- a/tests/testfontchooserdialog.c
+++ b/tests/testfontchooserdialog.c
@@ -111,8 +111,7 @@ main (int argc, char *argv[])
                                         monospace_filter, NULL, NULL);
     }
 
-  g_signal_connect (window, "delete-event",
-                    G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_main ();
 

diff --git a/tests/testframe.c b/tests/testframe.c
index 5da3c56cc5400e37aeba2753cd2bd919f93b5b27..d193eed02229e8893a8ab90ad7904ef0ca7f50c7 100644 (file)
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -153,7 +153,7 @@ int main (int argc, char **argv)
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
 
-  g_signal_connect (window, "delete-event", gtk_main_quit, NULL);
+  g_signal_connect (window, "destroy", gtk_main_quit, NULL);
 
   vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
   g_object_set (vbox, "margin", 12, NULL);

diff --git a/tests/testgiconpixbuf.c b/tests/testgiconpixbuf.c
index 2ce7f6c8840796c547ef3de79f95f64c19be51a1..33930b3faafab881dddf995683d095904ba8f9f3 100644 (file)
--- a/tests/testgiconpixbuf.c
+++ b/tests/testgiconpixbuf.c
@@ -70,8 +70,7 @@ main (int argc,
 
   gtk_widget_show (toplevel);
 
-  g_signal_connect (toplevel, "delete-event",
-                   G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (toplevel, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_main ();
 

diff --git a/tests/testgmenu.c b/tests/testgmenu.c
index 8940af501f69af9c1f93ff60b318d919bdef3aa8..af91dc8c2a0b91a36e1f71481fc9a251f533935a 100644 (file)
--- a/tests/testgmenu.c
+++ b/tests/testgmenu.c
@@ -597,15 +597,6 @@ create_add_remove_buttons (GActionGroup *group,
 #define BUS_NAME "org.gtk.TestMenus"
 #define OBJ_PATH "/org/gtk/TestMenus"
 
-static gboolean
-on_delete_event (GtkWidget   *widget,
-                GdkEvent    *event,
-                gpointer     user_data)
-{
-  gtk_main_quit ();
-  return TRUE;
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -639,7 +630,7 @@ main (int argc, char *argv[])
     }
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  g_signal_connect (window, "delete-event", G_CALLBACK(on_delete_event), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (window), box);
 

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 05257bceea009c07e73b8f222c5b98cea4945a93..5aafd00ce51e1dcce06f4033cae8ab03255ea8e5 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1939,14 +1939,10 @@ create_listbox (GtkWidget *widget)
       int i;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_hide_on_close (GTK_WINDOW (window), TRUE);
       gtk_window_set_display (GTK_WINDOW (window), display);
 
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed),
-                        &window);
-      g_signal_connect (window, "delete-event",
-                        G_CALLBACK (gtk_true),
-                        NULL);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_window_set_title (GTK_WINDOW (window), "listbox");
 
@@ -2283,15 +2279,11 @@ create_menus (GtkWidget *widget)
       GdkDisplay *display = gtk_widget_get_display (widget);
       
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_hide_on_close (GTK_WINDOW (window), TRUE);
 
       gtk_window_set_display (GTK_WINDOW (window), display);
       
-      g_signal_connect (window, "destroy",
-                       G_CALLBACK (gtk_widget_destroyed),
-                       &window);
-      g_signal_connect (window, "delete-event",
-                       G_CALLBACK (gtk_true),
-                       NULL);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
       
       accel_group = gtk_accel_group_new ();
       gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
@@ -7928,12 +7920,7 @@ create_main_window (void)
   gtk_window_move (GTK_WINDOW (window), 50, 20);
   gtk_window_set_default_size (GTK_WINDOW (window), -1, 400);
 
-  g_signal_connect (window, "destroy",
-                   G_CALLBACK (gtk_main_quit),
-                   NULL);
-  g_signal_connect (window, "delete-event",
-                   G_CALLBACK (gtk_false),
-                   NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (window), box1);

diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index f8e29d47b38b1f08f1021edbdbb8518f57fd09d7..5755b924174c896a0869421ec860a61c9b59e508 100644 (file)
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -831,24 +831,6 @@ create_window (void)
   return window;
 }
 
-static gboolean
-main_window_delete_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
-  gsize i;
-
-  for (i = 0; i < G_N_ELEMENTS (interfaces); ++i)
-    {
-      if (interfaces[i].window)
-        gtk_widget_destroy (interfaces[i].window);
-    }
-
-  gtk_widget_destroy (widget);
-
-  gtk_main_quit ();
-
-  return TRUE;
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -858,8 +840,7 @@ main (int argc, char *argv[])
 
   window = create_window ();
 
-  g_signal_connect (window, "delete-event",
-                    G_CALLBACK (main_window_delete_cb), window);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_widget_show (window);
 

diff --git a/tests/testicontheme.c b/tests/testicontheme.c
index 6126e020188b405a5ff3532dd2123c4c4309709e..02e775dc68f66a1d04132bb44726fa74d2c851c0 100644 (file)
--- a/tests/testicontheme.c
+++ b/tests/testicontheme.c
@@ -122,8 +122,7 @@ main (int argc, char *argv[])
       gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
       g_object_unref (pixbuf);
       gtk_container_add (GTK_CONTAINER (window), image);
-      g_signal_connect (window, "delete-event",
-                        G_CALLBACK (gtk_main_quit), window);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
       gtk_widget_show (window);
       
       gtk_main ();
@@ -149,8 +148,7 @@ main (int argc, char *argv[])
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       image = gtk_image_new ();
       gtk_container_add (GTK_CONTAINER (window), image);
-      g_signal_connect (window, "delete-event",
-                        G_CALLBACK (gtk_main_quit), window);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
       gtk_widget_show (window);
 
       info = gtk_icon_theme_lookup_icon_for_scale (icon_theme, argv[3], size, scale, flags);

diff --git a/tests/testlevelbar.c b/tests/testlevelbar.c
index 9f21e99cfc5c70419f1b85fae23e5135ebc714ec..255bd1d5235b0685e3ce2f0dc67dcef71fcb155d 100644 (file)
--- a/tests/testlevelbar.c
+++ b/tests/testlevelbar.c
@@ -55,15 +55,6 @@ increase_level (gpointer data)
   return G_SOURCE_CONTINUE;
 }
 
-static gboolean
-window_delete_event (GtkWidget *widget,
-                     GdkEvent *event,
-                     gpointer _data)
-{
-  gtk_main_quit ();
-  return FALSE;
-}
-
 static void
 toggle (GtkSwitch *sw, GParamSpec *pspec, GtkLevelBar *bar)
 {
@@ -102,8 +93,7 @@ main (int argc, char *argv[])
 
   gtk_widget_show (window);
 
-  g_signal_connect (window, "delete-event",
-                    G_CALLBACK (window_delete_event), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   g_timeout_add (100, increase_level, bar);
   gtk_main ();

diff --git a/tests/testnotebookdnd.c b/tests/testnotebookdnd.c
index 26f7693ca53f073a3fc8adcbb1c6bcb55b4e3b64..9fd00e6500852427efa6b551174d7c7c355c3f94 100644 (file)
--- a/tests/testnotebookdnd.c
+++ b/tests/testnotebookdnd.c
@@ -334,7 +334,7 @@ main (gint argc, gchar *argv[])
   gtk_container_add (GTK_CONTAINER (window), grid);
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
 
-  g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_widget_show (window);
 

diff --git a/tests/testoutsetshadowdrawing.c b/tests/testoutsetshadowdrawing.c
index b76382510cd819f47d4fc63702110390d5b51e97..aeb4461de3dd0ed93f155cd2b5f17d3bba7e3902 100644 (file)
--- a/tests/testoutsetshadowdrawing.c
+++ b/tests/testoutsetshadowdrawing.c
@@ -149,7 +149,7 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (box), top);
   gtk_container_add (GTK_CONTAINER (box), bottom);
   gtk_container_add (GTK_CONTAINER (window), box);
-  g_signal_connect (window, "delete-event", gtk_main_quit, NULL);
+  g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   gtk_widget_show (window);
 
   gtk_main ();

diff --git a/tests/testplacesview.c b/tests/testplacesview.c
index c8f03c0ceabe72c0575e773384fe002816a12049..e258c4405d5cbd1e007870c9dc3926e6a3d08193 100644 (file)
--- a/tests/testplacesview.c
+++ b/tests/testplacesview.c
@@ -18,7 +18,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (win), view);
   gtk_widget_show (win);
 
-  g_signal_connect (win, "delete-event", G_CALLBACK (gtk_main_quit), win);
+  g_signal_connect (win, "destroy", G_CALLBACK (gtk_main_quit), win);
 
   gtk_main ();
 

diff --git a/tests/testpopover.c b/tests/testpopover.c
index f77c7036f537ea2340db3ab65a96a1c69626fee2..3ece11139bb92e4fbc3a3628f58a648e90a426d7 100644 (file)
--- a/tests/testpopover.c
+++ b/tests/testpopover.c
@@ -156,7 +156,7 @@ main (int argc, char *argv[])
   gtk_grid_attach (GTK_GRID (grid), combo, 2, 5, 1, 1);
 
 
-  g_signal_connect (win, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (win, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   gtk_widget_show (win);
 
   gtk_main ();

diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c
index adf909d6fd897a123032cd04a17245ae99e9219c..3f247771d314122216a34039770d47ee2451ea08 100644 (file)
--- a/tests/testtreecolumnsizing.c
+++ b/tests/testtreecolumnsizing.c
@@ -175,7 +175,7 @@ main (int argc, char **argv)
   /* Window and box */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
-  g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
   gtk_container_add (GTK_CONTAINER (window), vbox);

diff --git a/tests/testwidgetfocus.c b/tests/testwidgetfocus.c
index 978aee643158a28f578b157d744157f1c6854030..c527abfe0d720462efb556cfcf501a6d1aed398a 100644 (file)
--- a/tests/testwidgetfocus.c
+++ b/tests/testwidgetfocus.c
@@ -287,7 +287,7 @@ main()
   gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
 
   gtk_container_add (GTK_CONTAINER (window), widget);
-  g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_widget_show (window);
 

diff --git a/tests/visuals/visuals.c b/tests/visuals/visuals.c
index 7089158ffefa5842a62ff0f425d122bd1589dde3..7faed005361b3549727c1d183bb9ec3189fc8cc3 100644 (file)
--- a/tests/visuals/visuals.c
+++ b/tests/visuals/visuals.c
@@ -42,9 +42,7 @@ create_dark_popup (GtkWidget *parent)
   gtk_window_set_decorated (GTK_WINDOW (popup), FALSE);
   gtk_widget_set_size_request (popup, 100, 100);
   gtk_window_set_resizable (GTK_WINDOW (popup), FALSE);
-
-  g_signal_connect (popup, "delete-event",
-                    G_CALLBACK (gtk_true), NULL);
+  gtk_window_set_hide_on_close (GTK_WINDOW (popup), TRUE);
 
   gtk_container_add (GTK_CONTAINER (popup), button);
   g_signal_connect (button, "toggled",